Commented cleanup -- due to an error on jenkins