Removed a couple of useless variables