Clean up old unused code