Remove unused files
Remove empty check from