remove long return
more cleanups