some deletions and removed hardcoded strings