Small fixes

Removed some old comments and code to make it more readable