Minor shifts
Removed WTForm