Delete commented out code. Rename fay top level.