removed some sanity elements