Remove explicit base dependency