Removing some legacy properties