removing else in callback