Removed all lines of code creating extra latches (or modified them so that they didn't create such)
Meh...