Remove some excess forms, clean up js on port form repeatable