merge MessageInput2 with MessageInput

remove all non-transport based inputs, and replace them with their new counterparts
the class names have not changed to retain compatibility with previous inputs