Fixed issue: Cleanup forms