manually deleting problem files re circular dependency in decorator pattern