rename class, remove debug