Removed clutter from master