1 day to go

more cleaning up