Clean up unused code fragments