Cleanup & RHEL > 5 removal