trimmed dead code
todo done