Clean up, Added eina_unused for unused vars
updated config