suppres form remove
fix remove functionality