Remove extranneous vars