American rapper and music executive Sean Combs, aka Diddy, has been removed from suicide watch, according to law enforcement sources. Diddy was arrested on September 16 by Homeland Security on suspicion of sex trafficking, racketeering conspiracy, and interstate transportation for prostitution. He was placed on suicide watch in prison but has since been removed, People magazine reports.

Diddy’s lawyer states he is “focused and very strong” and preparing for his trial, denying all charges. The rapper entered a not-guilty plea on September 17, but his bail requests were rejected twice. Federal officers seized evidence, including drugs and over 1,000 bottles of baby oil, during the raid on Diddy’s Beverly Hills mansion in March.

Diddy’s lawyer claimed the baby oil was purchased in bulk from Costco, which the company denied. The trial is set for early October..