Got rid of duplicate form