remove unneeded definitions
cleanup
restore BSD license to all swift files