Remove rebuild methods
Add new version with rebuild method detect