pruned unused components
a few inline comments added