code cleanup: remove unnecessary and redundant calls