Remove origin. Fix small issues