Cleanup; ARRobutt compiles now