Refactor. Getting rid of some unused code.