MS - Refactoring forms and add remove list pipes.