cleaning up commented and useless code