remove unnecessary promises