More robust lock-board-func. for TTT + Cleanups