Cleaned up some remnants from old HS.