Remove unused code and missleading comments