Remove unused method. Code coverage is now 98%
Remove base class since we only have one derived class