Removed some clutter