Remove old todoes and 'dev' codes