Fix removal of away class