fix oias crap and remove some stuff