removed any part of code that is not related to me