cleanup and oracle linux 7 support