[#221] Clean up commented out code