maor cleanup