Comments obsolete class & fixing one bug