removed and replaced some useless stuff