Some optimization
Removing unnecessary scheme