removing debug prints and un-needed cmds