Cleanup remove unused code