Remove commented out button template
- Clean up buttons: remove unneeded references
- Code cleanup: remove function that was never called