removed unused includes. Fixed created generic resources to not be tracked