enable @CompileStatic wherever possible
cleanup of commented code and platform compiled statically