cleaning up drop code