Remove additional old screens
Cleanup old function calls
Remove more of the old functions