cleanup after redesign... which messed several things up