Remove commented code

General tidy and cleanup