Remove the future code from solution