Removed unneeded code and classes.