Remove now unneeded Input Class and Related