Cleanup, remove some unused code.