cleanup classes
more todos solved