Remove Dead Code

These shouldn't be supported anymore