Took out some useless stuff