rm'd some useless stuff