Removed Solaris support and unused code