drop code cleaned up