Removing some legacy code