Removed superfluous code and variables