Fix widget removal related problems, put clearing at widget update phase

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>