simplified cleanup script