Quick cleanup

Just tidying up commented out code etc