Removed unneccessary classes which should have been library stuff