Got rid of some forms