code cleanup, remove comments