Getting rid of unneccessary buttons