HV-824 Removing some obsolete comments and files