Updated comments and removed unsupported methods