Re-imported dependencies and cleanup