Removing more unused code and working on U4-5808