Removed model and other classes we won't use