Trimming superfluous code