Removed redunant lines and obsolete stuff...