Ned/remove unused code

The result of this code is not used, maybe you intended it for later?