Some cleanup of unused methods.