[#97] Clean up - Remove unused code