cleaned up redundant promises