Cleanup options class