lets see how many commits less I can make than jd

update and remove stuff