Cleaned up a few more drug things