Bug fixes.
Removed unused file.