updated helper with class declarations
added remove.wait