Removing old code that was migrated from FM's commit