Revert "Comments and non-static file names"

This reverts commit 4229f22c452f72aac1b181da58506b8911ad972a.