Cleaned up the surrogate and opt module files