Removed optional files, revised