Cleaning out some unused vars