[Stable] Class clean up