Killed dead code again %)