Removed bloat, general clean up