Ok, last cleanup for 2day. I swear.