Cleanup of legacy code from fk7268