Package update and cleanup