Cleaning the request handlers up