Forms functionality, models cleanup