Inputs clean-up