Clean up excess code