removing buster specific code