Removed unnecessery code