Check to make sure we should be adding properties
Remove unused debugging code