Removed unused definitions