remove ununsed code and structure