Removed todos, refactoring hints and not used code