removing stuff for my personal fork