Removed code that was moved to other classes.