New, simpler pass
Removed unnecessary file