Remove top scope and -> chaining