Removed dependencies on doctine extensions