420.15 Issue76 branch - Removed some more aline traps