Cleaning up my mess...