Issue #18: remove overlay