Removing some unused functionality