Removed garbage
Updated classes list