Removing some unnecessary classes and output.