Removing some code and touching other parts