remove stuff from patch 10 that was added here too