remove hardcoded button references