Cleanup, removed unused objects.