Merge "Remove unneeded build files"