Fix dropping bug
Cleanup