Removed unnescessary classes