Removed some garbage variables