Removed inputs made them part of templates