Syntax cleanup and removal of unnecessary unsupported_osxversion function