More stuffs; More compability.
removed useless stuffs