Refactoring and removing empty classes.