Minor renames and removed un-used code.