Remove Base class