Added initial support for removing buttons