Cleaned up remaining traces of external