More work on paper, removal of unused / outdated types