Removed exception and removed some junks