Removed some unneeded classes

There were some Factory interfaces that didn't work out. Still working
on perfecting that design pattern and using it to its fullest.