just adding comments and removal of observers