Less setup pt ii, cleaning up