Removed some unused functionality.