Clean up code added