Forgot to remove a few root files
Fixed spec merge conflict