remove unused components, and add input form