more rhel5 mode cleanup