Cleaned up superfluous code