Removed some duplicate lines