cleanup last major changes