Current Status: Remove unused code