Removed some superfluous code