Removed mock classes (#214)