Remove protected and private method scopes, TODO: refactor