Fixed #1.
Also removed unused file.