Cleaned up superfluous code.