Remove unused variable
Remove empty lines at end of entry files