cleaned up monkey patches so they don't stomp on stuff