Removed old accessor functions, replaced usage in snapping code