Clean up superfluous code