Clean up gem and get rid of silly response handling