Remove useless return statements and inaccessible reload code