remove stuff now handled somewhere else