Remove old prototype
Remove P5 controller from branch