Removed some deprecated files, added couple of fixes from the main
branch