more cleaning (still need to commit stuff to test jenkins)