Cleaning up some rb keys