Removed bloat, fixed logger