Removed TEST COMMENT and other deprecated comments