Removing unused code and also working on U4-5805