REmove commented code and fix topics vocabulary