Cleanup layering and post processing a bit