consolidate and cleanup