Removed unused files and made few fixes