Removed some junk variables (c&p error?)