Removed dead code / Added org profile test