Move code
Delete unused code