Re #443. More tabs and cleanup. Removed unused classes.