cleanup, redundancy killed off