Removed unused attributes and code