Removed unecessary functionality, unecessary comments and last todos, ready for final tests