Cleaned up some obsolete NOCOMMIT tags