tracy - removed left over disable stuff.