Removed junk and refatored
delete one file