Finished cleaning out unused code