Removed some bloat, and signing off for tonight