Remove commented out code
Update mechanics