Wout: Did some cleanup