With these changes, this package should be properly cleaned up and not require any further changes.