issue: remove uneeded code