package move, remove unused things.