More code cleanup and input classes removed