Remove return statement where applicable