progress
again
removing stuff