Remove unneeded returns and shit.