cleanup extra return statement