Reader optimization
Remove unused files