Remove dependency on manifest files