Start removing Baer's name from everything