Unused file and code removed