Removing self.class and Notes from @rajofchennai