Removed failing stuffs.
Big fix release try two