Some minor refactoring

Deleted some old commented out code. You will never use it!