Removed some classes for code-reduction and simplicity.