Cleanup and removed and moved properties to resources