More cleanups

This commit provides some cleanups,
removing painful namedobject creation.