Cleanups and CentOS 6 support

Cleanups and CentOS 6 support