Pod updates, Cleaning up forms code