feature finish cleanups