Cleaned up integrators and removed "numeric" property from equation component
Cleaned up equation component