Finish cleaning up Gabe's mess