Remove commented code and comments

No longer required.