Cleanup
Removed order_type_id from tasks