Clean up unused/unfinished code