removing useless code, cleanup