Remove atpy dependancy