removing unneeded class; fixing notifications issue
adding back variable