STY: Cleanup by removing unnecessary fields