remove stuff now possible in enc
cleanup old things