Cleaned up old non-Ekeko code..