Clean up - remove debugs!