Got read of some irrelevant variables