more removal of unused code, slowly turning this project into  a mostly swift project...