Cleaned up unused definitions