CLEANUP: Simplify forminput related classes