Revert "Subtype re-added"

This reverts commit a1e62ca7d71dcaab0f5e2e97ca18353e8e799758.
Proves_dec 85% complete