Removed unnecessary fields and uncommented the resources