Cleanup some un-used vars