UPDATED: Removed old commented code from mcsolve