simplified cleanup