Clean up for futher changes