Removed the unnecessary extra classes.