deleting more unused code