Remove dependency on devtools