Cleanup

Signed-off-by: Vincent Van Driessche <vncntvandriessche@gmail.com>