Removed more some unused code