Switched everything over to new dropStack
Cleaned up after dropStack changes