Removed some code that is not needed anymore