Cleaned up discarder!