Cleaned code from obsolete comments