Fix for DB retrys Part2 + Removed old build systems