Improvements and removed unused files

See issues log for changes.