removed needless crap