Changes due to lint and trying to get the remove butttons to work