Cleanup some code that is not needed anymore