code cleanup, mostly useless but it makes me feel better