Remove kickstart things as they are not needed

Pull into master