Contracted unused method
Fixed additional move bug
Removed test code