Removing unused functionality.