Remove old transition stuff and replace with base