Removed some useless things