removing comments, unused functions