Little refactor: removed unused references etc.