Remove unnecessary return

All return statements deleted, they are unnecessary
fix merge conflict in load message