Consolidate and cleanup