Deleted stuff, moved some stuff