Doing some cleanup of useless variables