Remove old code as there is issue on import.