Cleanup some never-used code.