remove more ununsed code
remove more unused code
remove unused code
remove again unused code