Clean up get() calls, remove commented out code