[#43] Clean up unused code