Move stuff, remove not-used stuff