cleanup modifications