Remove useless lines
Add topics for remaining subjects