Unused code has been removed