Removed old testing methods and buttons