Removing some no longer used code