Clean up some excess code