[TASK] Cleanup package

This package will soon be deprecated.