removed unused objects, updated comments