Remove / rearrange refactoring leftover