Clean Up

Should have been done long ago