User code clear up