Remove kinds. Closes #150