cleanup of intermediate classes