Removed unused self attributes