Remove multiple return in prep for locks