RS-61: refactored some names and removed methods that were no longer needed