Remove pointless return statements