Remove unneeded file
Fix off-by-one bug