Remove missing code and fixed some configuration.

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
Merge branch '2.0'