remove old code, add small updates
making progress