rename fixer and remove unnecessay control