Cleanup, compacting and optimization part.3.5 console