Removed OpenForm, cleaned up TODO action items