Removing a few remaining @package in Database