just some code clean up nothing much (and a few hidden things)