cleanup & some forms files