Deleted not required files + fixes for some issues