Removed some button stuff