Major housekeeping and getting in line with rest of projects w.r.t. ivy builds