Remove dependency on scotty