Fix filename,dead code cleanup