Removed unused files and applied bug fixes.