- removed unused functions and redundant code, as a result of static analysis