Bug: some self code left overs :(