Remove flexible code from vcs, update gitignore accordingly