Cleaning up some of the calls for /me