Fixed file name and removed unused references.