drop code cleanup