Cleanup and fixed denydrop