Remove old build
Minor improvements