Feature/71 refactor removed code

• Refactor code for removed checks, to allow integration of new features.
• Only this way we can follow DRY by adding nearly same features.

Resolves: #71 (closed)