cleaning up more buttons