Removed some attribute clutter