Removes unused code #306