Remove unnecessary forks and updating