Code cleanup. Removing unnecessary, non-public methods