Removed some useless stuff