Deleted unused classes and methods. Some methods parameters now is passing by reference