Some development code removed from last commit.