Fixed GitHub fails.

* Again cleaned code. GitHub pls.