initial commit after fork: removing unneeded things