Issue #1: Cleanup
Issue #1: Remove jQuery dependency for frame