Remove the OCD class, use Division