Commented out code should be removed without remorse :)