Remove snippit.utility.cls and clean imports