cleanup

see commit