cleanups. removing useless code