Removed idlist support
Added "Wout" column, deleted request without calibration and some code refactored.