Clean up code and remove code as before