started clean up
clean enough for now...