CleanUp resources and NWidget less code, same things ;)