Removing some unused functionality.