Remove unimpl's

Was implemented last pass